Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the .hpp headers from realtime_tools package (backport #1916) #1920

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Use the .hpp headers from realtime_tools package (backport #1916) #1920

merged 3 commits into from
Dec 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2024

Similar to ros-controls/ros2_controllers#1406

This is an automatic backport of pull request #1916 done by Mergify.

@mergify mergify bot added the conflicts label Dec 6, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Dec 6, 2024

Cherry-pick of ca48bdc has failed:

On branch mergify/bp/humble/pr-1916
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit ca48bdc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   controller_manager/test/test_chainable_controller/test_chainable_controller.hpp
	deleted by us:   joint_limits/include/joint_limits/joint_limiter_interface.hpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich
Copy link
Contributor

We haven't backported the hpp files to humble

@codecov Codecov
Copy link

codecov bot commented Dec 16, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.92%. Comparing base (619413c) to head (80df08b).
Report is 1 commits behind head on humble.

Additional details and impacted files 
@@           Coverage Diff           @@
##           humble    #1920   +/-   ##
=======================================
  Coverage   62.92%   62.92%           
=======================================
  Files         109      109           
  Lines       12505    12505           
  Branches     8481     8482    +1     
=======================================
  Hits         7869     7869           
  Misses        852      852           
  Partials     3784     3784
Flag Coverage Δ
unittests 62.92% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...chainable_controller/test_chainable_controller.hpp 100.00% <ø> (ø)

@christophfroehlich christophfroehlich merged commit 6a8053e into humble Dec 17, 2024
11 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1916 branch December 17, 2024 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophfroehlich christophfroehlich christophfroehlich approved these changes

@ARK3r ARK3r Awaiting requested review from ARK3r

@DasRoteSkelett DasRoteSkelett Awaiting requested review from DasRoteSkelett

@destogl destogl Awaiting requested review from destogl

@harderthan harderthan Awaiting requested review from harderthan

@homalozoa homalozoa Awaiting requested review from homalozoa

@Maverobot Maverobot Awaiting requested review from Maverobot

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@christophfroehlich